main: don't hook up overview keybinding until after startup

Toggling the overview during the startup animation reportedly
causes stuck grab and other odd behavior.

There's no reason to handle toggling the overview during this
time anyway.

This commit defers that handling until after startup.

https://bugzilla.gnome.org/show_bug.cgi?id=694837

diff --git a/js/ui/layout.js b/js/ui/layout.js
index 61e22506641d88dd471111491c0eef05edf63a9d..b178b53c88ef28c432df5d6276c361e4e52595e8 100644 (file)
--- a/js/ui/layout.js
+++ b/js/ui/layout.js
@@ -639,6 +639,8 @@ const LayoutManager = new Lang.Class({
         this.emit('panel-box-changed');
 
         this._queueUpdateRegions();
+
+        this.emit('startup-complete');
     },
 
     showKeyboard: function () {

diff --git a/js/ui/main.js b/js/ui/main.js
index d3ce7df764b10e4f2ef78b12093cb3235723e6b4..4025bd7873e2ecf84ef621e43c268e90af6cd3f0 100644 (file)
--- a/js/ui/main.js
+++ b/js/ui/main.js
@@ -58,7 +58,7 @@ let shellDBusService = null;
 let shellMountOpDBusService = null;
 let screenSaverDBus = null;
 let modalCount = 0;
-let keybindingMode = Shell.KeyBindingMode.NORMAL;
+let keybindingMode = Shell.KeyBindingMode.NONE;
 let modalActorFocusStack = [];
 let uiGroup = null;
 let magnifier = null;
@@ -202,6 +202,11 @@ function startSession() {
     layoutManager.connect('startup-prepared', function() {
                               layoutManager.startupAnimation();
                           });
+    layoutManager.connect('startup-complete', function() {
+                              if (keybindingMode == Shell.KeyBindingMode.NONE) {
+                                  keybindingMode = Shell.KeyBindingMode.NORMAL;
+                              }
+                          });
 }
 
 let _workspaces = [];